Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Glide process image assets on upload #6040

Merged
merged 69 commits into from
Jan 10, 2023
Merged

Glide process image assets on upload #6040

merged 69 commits into from
Jan 10, 2023

Conversation

jesseleite
Copy link
Member

@jesseleite jesseleite commented May 13, 2022 •
edited
Loading

Closes statamic/ideas#485
Closes statamic/ideas#804
References statamic/ideas#300

  • Add new glide config to asset container edit form.
    image (20)
    • Wire up new glide_source_preset config.
      • Glide process images on upload.
      • Fix error when uploading non-glideable filetypes.
      • Hook up mark watermarking.
      • Add test coverage.
    • Wire up new glide_warm_presets config.
      • Ensure user can save glide_warm_presets: false to disable intelligent warming.
      • Glide configured warm presets on upload.
      • Glide intelligently on upload when warm presets are not configured (everything except glide_source_preset).
      • Glide configured warm presets when running pls glide:generate-presets.
      • Add test coverage.
    • Add new translatable strings to translation files.
    • Documentation PR.

jesseleite and others added 29 commits May 13, 2022 15:57
@jesseleite
Extract this path logic to clean up upload() method.
975b902
@jesseleite
Extract put() disk logic for file uploads.
f830cd0
@jesseleite
Process images using glide on upload.
5381669
@jesseleite
Ensure we delete tmp glide cache in storage after successful upload.
18e61c4
@jesseleite
Move private methods to bottom and docblock.
2919b30
@jesseleite
Add Glide Processing config field to asset containers.
266ab53
@jesseleite
Implement reading/writing of glide config on containers.
eb9add3
@jesseleite
Check container for glide params when uploading.
3bbfa7a
@jesseleite
Pass tests again.
24ec7f1
@StyleCIBot
Apply fixes from StyleCI
7a2cf09
@jesseleite
Copy driver and file extensions config from GlideManager.
262bf0b
@jesseleite
Add some basic test coverage for glide on upload.
52c3ed3
@jesseleite
Extract upload logic to Assets\Uploader class.
6c85db3
@jesseleite
This was failing test 🤔.
43d02c9
@jesseleite
Import ServerFactory.
0a76aee
@jesseleite
Refactor glideTmpPath to property.
0a89a0e
@jesseleite
Pass test for non-glideable filetypes.
64e10ab
@jesseleite
Enable watermarks.
235254e
@jesseleite
Merge branch '3.3' of https://github.com/statamic/cms into feature/gl…
fd690f7 
…ide-asset-on-upload
@jesseleite
Add boolean label_html to select fieldtypes to allow rendering of h…
239b1cd 
…tml in option labels.
@jesseleite
Update glide config fields on asset container edit form.
e2b95c2
@jesseleite
Finish controller and ensure glide_warm_intelligent toggle state lo…
c51e0e0 
…ads properly on edit.
@jesseleite
Store glide_source_preset and glide_warm_presets instead of glide.
e0614b5
@jesseleite
Load glide preset params from assets.php config.
2ebac81
@jesseleite
Update tests.
bc35a09
@jesseleite
This is redundant.
69877d5
@jesseleite
Ensure user can explicitly disable intelligent warming of glide presets.
6104ebe
@jesseleite
Intelligently determine which glide presets to ignore based on contai…
b7f47f8 
…ner config.
@jesseleite
Ensure container’s configured glide settings are respected when gener…
70b8635 
…ating presets for asset.
@jesseleite jesseleite changed the base branch from 3.3 to master May 31, 2022 14:59
@jasonvarga jasonvarga mentioned this pull request Dec 20, 2022
Merged
@jackmcdade jackmcdade added this to the 3.4 milestone Jan 4, 2023
@what-the-diff
Copy link

what-the-diff bot commented Jan 4, 2023 •
edited
Loading

  • Added source_preset and warm_presets to asset container config.
  • Updated the uploader component in CP to use these new settings, if present on a given container.
  • Refactored some of the file uploading logic into an AssetUploader class that can be used by other parts of Statamic (e.g., File Upload fieldtype). This is similar to how we have FieldsetBlueprintLoader for blueprints, but it's not quite as generic because there are still some assumptions about where files will end up being uploaded from/to based on whether or not they're assets vs just regular files being uploaded via a form submission somewhere else in Statamic (like with forms addon). I'm open to suggestions here! :)
  • Added source_preset and warm_presets to asset container config
  • Updated the AssetContainersController with new fields for these settings
  • Updated GlideManager::server() method to accept an array of overrides, so we can pass in a custom cache path when processing images from assets that have their own preset defined (ie: not using the default)
  • Added a few new config options to AssetContainer
  • Updated the asset upload process to use those configs if they're set
  • Created tests for all of that stuff, including some Glide integration testing (which is why I added define-env)

@jasonvarga
Merge branch 'master' into feature/glide-asset-on-upload
0eb5454
@jasonvarga
Files fieldtype can accept a container so it can perform the appropri…
8041402 
…ate processing
@jasonvarga
Pass the preset instead of converting to params
a355041
@jasonvarga
Allow Glide::server to accept config overrides, and use that.
71e0b0c
@jasonvarga
Pass disk into method so its identical, to help with upcoming refactor
82ebe62
@jasonvarga
Refactor uploader to be DRY between asset uploading and file fieldtyp…
7317217 
…e uploading
@jasonvarga
Only delete the single temporary file. Don't interfere with uploads i…
b8d3574 
…n other requests.
@jasonvarga
Remove now unnecessary property
311221e
@jasonvarga
apply b8d3574
1c56e00
@jasonvarga
no longer parent constructor
aa443c0
@jasonvarga
Create the uploaded file each time, rather than once across all provi…
5c033e1 
…ded cases. Prevents the uploaded file being missing on subsequent tests.
@jasonvarga
remove glide prefixes
72f5a69
@jasonvarga
wording
c446354
@jasonvarga
Change behavior of warmPresets so that it returns the appropriate pre…
f659518 
…sets, even when set to null.
@jasonvarga
Rework generate-presets command to loop through containers and only g…
8dc5a06 
…enerate appropriate presets
@jasonvarga
unnecessary
69211c3
@jasonvarga
More refactoring ...
6528bab 
- container ignoredPresets swapped into warmPresets
- add warmPresets to asset, which takes container presets plus only appropriate cp preset
- preset generator gets the presets from the new asset warmPresets method
- add test for preset generator
- remove preset generator presets array constructor arg since now it comes from the asset
- remove glide upload tests from asset test in favor of GeneratePresetImageManipulationsOnUpload. we know the event is dispatched.
@jasonvarga
wording
24f9d03
@jasonvarga
wip
38903bd
@jasonvarga
generate presets command uses asset specific presets now
fd2f836 
also make the error output nicer and order containers by title
@jasonvarga
throw exception if you try to get a thumbnail preset that doesnt exist
68155c7
@jasonvarga
Merge branch 'master' into feature/glide-asset-on-upload
72933a2 
# Conflicts:
#	src/Imaging/GlideManager.php
#	tests/Feature/Fieldtypes/FilesTest.php
@jasonvarga
wording
805c2f9
@jasonvarga
unused
580c7fe
@jasonvarga jasonvarga merged commit c840e30 into master Jan 10, 2023
@jasonvarga jasonvarga deleted the feature/glide-asset-on-upload branch January 10, 2023 19:05
@jesseleite jesseleite mentioned this pull request Jan 16, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackmcdade jackmcdade jackmcdade approved these changes

@jasonvarga jasonvarga Awaiting requested review from jasonvarga

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.4
Development

Successfully merging this pull request may close these issues.
5 participants
@jesseleite @klickreflex @jackmcdade @jasonvarga @StyleCIBot